From 16296346b40fee63e6d284a38c52ddf0125962c5 Mon Sep 17 00:00:00 2001 From: Debian Science Team Date: Tue, 12 Jan 2021 21:06:04 +0000 Subject: [PATCH] Don't require external warnings that no longer exist (The cause is not actually known to be jedi 0.18, but it moved to a new upstream version since the last pandas and ipython didn't.) Author: Rebecca N. Palmer Forwarded: no Gbp-Pq: Name jedi018_compat.patch --- pandas/tests/arrays/categorical/test_warnings.py | 2 +- pandas/tests/frame/test_api.py | 2 +- pandas/tests/indexes/test_base.py | 2 +- pandas/tests/resample/test_resampler_grouper.py | 2 +- pandas/tests/series/test_api.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pandas/tests/arrays/categorical/test_warnings.py b/pandas/tests/arrays/categorical/test_warnings.py index 9e164a25..9d3df84a 100644 --- a/pandas/tests/arrays/categorical/test_warnings.py +++ b/pandas/tests/arrays/categorical/test_warnings.py @@ -18,7 +18,7 @@ class TestCategoricalWarnings: # GH 31324 newer jedi version raises Deprecation warning import jedi - if jedi.__version__ < "0.16.0": + if jedi.__version__ < "0.16.0" or jedi.__version__ >= "0.18.0": warning = tm.assert_produces_warning(None) else: warning = tm.assert_produces_warning( diff --git a/pandas/tests/frame/test_api.py b/pandas/tests/frame/test_api.py index cc57a397..b7b51b64 100644 --- a/pandas/tests/frame/test_api.py +++ b/pandas/tests/frame/test_api.py @@ -542,7 +542,7 @@ class TestDataFrameMisc: # GH 33567, jedi version raises Deprecation warning in Ipython import jedi - if jedi.__version__ < "0.17.0": + if jedi.__version__ < "0.17.0" or jedi.__version__ >= "0.18.0": warning = tm.assert_produces_warning(None) else: warning = tm.assert_produces_warning( diff --git a/pandas/tests/indexes/test_base.py b/pandas/tests/indexes/test_base.py index a8dedffa..6fdc3b42 100644 --- a/pandas/tests/indexes/test_base.py +++ b/pandas/tests/indexes/test_base.py @@ -2206,7 +2206,7 @@ Index(['a', 'bb', 'ccc', 'a', 'bb', 'ccc', 'a', 'bb', 'ccc', 'a', # GH 31324 newer jedi version raises Deprecation warning import jedi - if jedi.__version__ < "0.16.0": + if jedi.__version__ < "0.16.0" or jedi.__version__ >= "0.18.0": warning = tm.assert_produces_warning(None) else: warning = tm.assert_produces_warning( diff --git a/pandas/tests/resample/test_resampler_grouper.py b/pandas/tests/resample/test_resampler_grouper.py index 6ca96563..64211eae 100644 --- a/pandas/tests/resample/test_resampler_grouper.py +++ b/pandas/tests/resample/test_resampler_grouper.py @@ -33,7 +33,7 @@ async def test_tab_complete_ipython6_warning(ip): # GH 33567, jedi version raises Deprecation warning in Ipython import jedi - if jedi.__version__ < "0.17.0": + if jedi.__version__ < "0.17.0" or jedi.__version__ >= "0.18.0": warning = tm.assert_produces_warning(None) else: warning = tm.assert_produces_warning(DeprecationWarning, check_stacklevel=False) diff --git a/pandas/tests/series/test_api.py b/pandas/tests/series/test_api.py index b174eb0e..d8f6ca91 100644 --- a/pandas/tests/series/test_api.py +++ b/pandas/tests/series/test_api.py @@ -498,7 +498,7 @@ class TestSeriesMisc: # GH 33567, jedi version raises Deprecation warning in Ipython import jedi - if jedi.__version__ < "0.17.0": + if jedi.__version__ < "0.17.0" or jedi.__version__ >= "0.18.0": warning = tm.assert_produces_warning(None) else: warning = tm.assert_produces_warning( -- 2.30.2